Merge with xenppc-unstable-merge.hg
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Wed, 21 Mar 2007 23:59:03 +0000 (23:59 +0000)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Wed, 21 Mar 2007 23:59:03 +0000 (23:59 +0000)
commit33ca4e4b543067bd2b07971a87fad2734ca1de2f
tree793babc083b9b0450c3a229d51d10f1688864e39
parent001e8c5cd8f60e7cafbfed9869862db46b5ed473
parent2ccced7b73c5d2d52febbaced473deeac9042c47
Merge with xenppc-unstable-merge.hg